Auto merge of #1844 - steveklabnik:gh1407, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 27 Jul 2015 19:16:34 +0000 (19:16 +0000)
committerbors <bors@rust-lang.org>
Mon, 27 Jul 2015 19:16:34 +0000 (19:16 +0000)
Fixes #1407


Trivial merge